Beacon Configuration Admin View, with CRUD and Regenerate and Revoke Tokens Actions by FionaLMcLaren · Pull Request #585 · rubyforgood/skillrx

FionaLMcLaren · 2026-02-04T10:16:42Z

What Issue Does This PR Cover, If Any?

Resolves #572

What Changed? And Why Did It Change?

This PR adds the actions to revoke and regenerate tokens. It refactors the previous
"regenerate" code in the controller to be in a model. These actions are accessible to an admin user on their Admin Dashboard, when viewing a Beacon. This PR also does some cleanup on the views here, e.g.: removing the flashes for :api_key, as the information is already included in the success flash

How Has This Been Tested?

RSpec

Please Provide Screenshots

Beacon Configuration Admin View - Index

Beacon Configuration Admin View - Show

Beacon Configuration Admin View - Edit

Beacon Configuration Admin View - Show, after regenerating token

Beacon Configuration Admin View - Show, after revoking token

…-api-keys - Removed old beacon migration that conflicted with device migrations - Updated BeaconsController to use Beacons::Creator service for API key generation - Changed beacon relationships from direct provider/tags to many-to-many beacon_providers and beacon_topics - Updated forms to use provider_ids and topic_ids multi-selects instead of single provider_id and tag_ids - Updated show page to display API key (when just created) instead of token - Updated index page to show region, language, provider count, and topic count - Removed beacon_tag model and references as we now use beacon_topics - Changed status from online/offline to active/revoked based on revoked_at timestamp

Topics use 'title' column, not 'name'. Updated controller and views to use Topic.active.order(:title)

- Update API key display messaging for admin context - Add regenerate_key action in BeaconsController using KeyRegenerator service - Add 'Regenerate API Key' button on show page with confirmation dialog - Full API key still shown only after creation/regeneration via flash - Clearer messaging that full key is displayed immediately after provisioning

- Added document_count method to Beacon model to count available topics - Added file_count method to count actual attached document files - Updated show page with 4 stat cards: Status, Available Topics, Document Files, and Configured Filters - Logic respects beacon's language, providers (or region if no providers), and topic filters

Resolves #572 Adds actions to revoke and regenerate tokens. Refactors the previous "regenerate" code in the controller to be in a model TODO: - Controller specs for beacons controller - Route for revoking a Token

spec/requests/beacons_spec.rb

token

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

- Add libffi-dev package to Dockerfile.dev for Alpine Linux to support ffi gem (dependency).

Allows Bundler to resolve dependencies for Darwin 25.

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: Sean Marcia <seanmarcia@github.com>

app/controllers/beacons_controller.rb

devjona · 2026-02-04T11:38:34Z

Hey @FionaLMcLaren for a ticket with so many visual elements, it's really helpful to put some screenshots in the PR description, particularly for:

Creating a token
Regen
Revoke

Thanks! Solid work!

app/views/beacons/index.html.erb

app/views/layouts/_sidebar.html.erb

config/routes.rb

devjona · 2026-02-16T22:26:58Z

@FionaLMcLaren thanks for providing screenshots! Please let us know when it's ready for review.

FionaLMcLaren · 2026-02-25T16:17:34Z

@devjona This is ready for review! 🫶

app/controllers/beacons/beacons_controller.rb

app/models/beacon.rb

dmitrytrager · 2026-02-26T22:45:44Z

app/views/beacons/_form.html.erb

+    <div class="form-grid-full" data-controller="select-tags" data-select-tags-dropdown-parent-value="body">
+      <%= form.label :topic_ids, "Topics", class: "form-label" %>
+      <%= form.select :topic_ids, 
+          options_from_collection_for_select(@topics, :id, :title, beacon.topic_ids),


Do you need help with this part?

app/views/beacons/beacons/show.html.erb

* Move Javascript logic for copying API key from view to its own stimulus controller, `beacons_controller` * Have full API key appear for copying on beacon creation or when the key is regenerated * New `Beacon` helper for status string display logic * Other refactors

app/helpers/beacons_helper.rb

devjona · 2026-03-14T15:27:16Z

app/javascript/controllers/beacons_controller.js

+export default class extends Controller {
+  static targets = ["button", "beaconApiKey"]
+
+  copyApiKey() {


I'm not sure this copy functionality is working (tried locally).

We could add to a later ticket, but the user can still see the API Key and manually select, copy.

What was the outcome in your case?

There was a mistake with action setup, should be fixed now

dmitrytrager · 2026-03-16T22:17:31Z

Can we merge master into this branch please?

* main: (28 commits) chore(deps): bump rails from 8.1.2 to 8.1.2.1 chore(deps): bump active_storage_validations from 3.0.2 to 3.0.4 chore(deps): bump solid_queue from 1.3.2 to 1.4.0 chore(deps): bump aws-sdk-s3 from 1.215.0 to 1.217.0 chore(deps): bump bcrypt from 3.1.20 to 3.1.22 chore(deps): bump kamal from 2.10.1 to 2.11.0 chore(deps): bump reactionview from 0.2.1 to 0.2.2 chore(deps-dev): bump rspec-rails from 8.0.3 to 8.0.4 chore(deps): bump thruster from 0.1.18 to 0.1.19 chore(deps): bump aws-sdk-s3 from 1.213.0 to 1.215.0 chore(deps-dev): bump faker from 3.6.0 to 3.6.1 chore(deps-dev): bump brakeman from 8.0.2 to 8.0.4 chore(deps): bump actions/upload-artifact from 6 to 7 Add file download endpoint for beacon content sync Add accessible_blobs method to Beacon model chore(deps-dev): bump web-console from 4.2.1 to 4.3.0 chore(deps): bump solid_queue from 1.3.0 to 1.3.2 chore(deps-dev): bump rspec-rails from 8.0.2 to 8.0.3 chore(deps): bump reactionview from 0.2.0 to 0.2.1 Bootstrap Mazer cleanup (#591) ...

Replaced `beacons#copyApiKey` with `click->beacons#copyApiKey` to ensure the Stimulus action is reliably wired up with an explicit event type. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

… and region Add a beacon-form Stimulus controller that fetches filtered options from a new filter_options endpoint whenever language or region selectors change. Topics are filtered by language_id; providers are filtered by region through the branches join table. Previously selected values that remain valid are preserved after each filter update. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

seanmarcia and others added 8 commits February 3, 2026 12:08

wip

035abfa

Merge feature/device-management-api-keys into beacons branch

27ab546

Fix topic field reference - use 'title' instead of 'name'

b4cfadd

Topics use 'title' column, not 'name'. Updated controller and views to use Topic.active.order(:title)

Wip

16a8485

Regenerate and Revoke Tokens on Beacon Configuration Admin View

ee1549b

Resolves #572 Adds actions to revoke and regenerate tokens. Refactors the previous "regenerate" code in the controller to be in a model TODO: - Controller specs for beacons controller - Route for revoking a Token

FionaLMcLaren changed the title ~~Regenerate and Revoke Tokens on Beacon Configuration Admin View~~ Beacon Configuration Admin View, with CRUD and Regenerate and Revoke Tokens Options Feb 4, 2026

FionaLMcLaren changed the title ~~Beacon Configuration Admin View, with CRUD and Regenerate and Revoke Tokens Options~~ Beacon Configuration Admin View, with CRUD and Regenerate and Revoke Tokens Actions Feb 4, 2026

FionaLMcLaren commented Feb 4, 2026

View reviewed changes

spec/requests/beacons_spec.rb Outdated Show resolved Hide resolved

Adds Request Spec for Beacons, and route for revoking a Beacon's API

ca83796

token

FionaLMcLaren force-pushed the beacons-regenerate branch from dbac880 to ca83796 Compare February 4, 2026 10:23

dependabot bot and others added 10 commits February 4, 2026 12:19

chore(deps): bump bootsnap from 1.20.1 to 1.22.0 (#576)

0a53932

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump tailwindcss-rails from 4.3.0 to 4.4.0 (#577)

9056305

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump thruster from 0.1.17 to 0.1.18 (#578)

dd6b8e9

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Update Favicon (#563)

b459b7e

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Upgrade to Ruby 4.0.1 (#570)

b37d46e

- Add libffi-dev package to Dockerfile.dev for Alpine Linux to support ffi gem (dependency).

Add macOS 15 platform to Gemfile.lock

4727750

Allows Bundler to resolve dependencies for Darwin 25.

chore(deps-dev): bump brakeman from 8.0.1 to 8.0.2 (#583)

75f1500

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Tailwind migration cleanup – sidebar (#584)

07a9fdf

Co-authored-by: Sean Marcia <seanmarcia@github.com>

Fixing error - turns out did not call set_beacon for revoke_key

10a48ea

Gets rid of the redundant specs in the Beacon request spec

3954d6e

FionaLMcLaren force-pushed the beacons-regenerate branch from 2071a2e to 3954d6e Compare February 4, 2026 11:21

Merge branch 'main' into beacons-regenerate

c125a91

devjona reviewed Feb 4, 2026

View reviewed changes

app/controllers/beacons_controller.rb Outdated Show resolved Hide resolved

devjona reviewed Feb 4, 2026

View reviewed changes

app/controllers/beacons_controller.rb Outdated Show resolved Hide resolved

devjona reviewed Feb 4, 2026

View reviewed changes

app/views/beacons/index.html.erb Outdated Show resolved Hide resolved

devjona reviewed Feb 4, 2026

View reviewed changes

app/views/layouts/_sidebar.html.erb Outdated Show resolved Hide resolved

FionaLMcLaren force-pushed the beacons-regenerate branch from 81601e1 to 8dd9f8e Compare February 12, 2026 15:06

FionaLMcLaren mentioned this pull request Feb 12, 2026

Add Stimulus Controller to update providers/topics selection on Beacons form #594

Open

FionaLMcLaren force-pushed the beacons-regenerate branch 5 times, most recently from cd9ea07 to 2464541 Compare February 13, 2026 16:39

dmitrytrager reviewed Feb 13, 2026

View reviewed changes

config/routes.rb Outdated Show resolved Hide resolved

FionaLMcLaren force-pushed the beacons-regenerate branch 2 times, most recently from e2867e3 to 4cc78e3 Compare February 23, 2026 12:32

More review changes

c595113

FionaLMcLaren force-pushed the beacons-regenerate branch from 4cc78e3 to c595113 Compare February 23, 2026 12:34

FionaLMcLaren marked this pull request as ready for review February 23, 2026 14:25

FionaLMcLaren requested review from devjona and dmitrytrager February 25, 2026 12:29

dmitrytrager requested changes Feb 26, 2026

View reviewed changes

Review changes:

99069e6

* Move Javascript logic for copying API key from view to its own stimulus controller, `beacons_controller` * Have full API key appear for copying on beacon creation or when the key is regenerated * New `Beacon` helper for status string display logic * Other refactors

FionaLMcLaren requested a review from dmitrytrager March 2, 2026 16:41

devjona reviewed Mar 14, 2026

View reviewed changes

app/helpers/beacons_helper.rb Outdated Show resolved Hide resolved

devjona reviewed Mar 14, 2026

View reviewed changes

dmitrytrager and others added 7 commits March 23, 2026 21:51

rescue from StandardError in beacons controller

2c5ffc1

eliminate beacons helper, use method from model

107c2de

move beacons out of redundant beacons module

d6a6a4e

fix(beacons): use explicit click event in Stimulus action descriptor

d2e4b6f

Replaced `beacons#copyApiKey` with `click->beacons#copyApiKey` to ensure the Stimulus action is reliably wired up with an explicit event type. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: resolve code style issues

b07c42f

Conversation

FionaLMcLaren commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What Issue Does This PR Cover, If Any?

What Changed? And Why Did It Change?

How Has This Been Tested?

Please Provide Screenshots

Uh oh!

Uh oh!

Uh oh!

Uh oh!

devjona commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

devjona commented Feb 16, 2026

Uh oh!

FionaLMcLaren commented Feb 25, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dmitrytrager Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

devjona Mar 14, 2026

Choose a reason for hiding this comment

Uh oh!

devjona Mar 14, 2026

Choose a reason for hiding this comment

Uh oh!

dmitrytrager Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

dmitrytrager Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

dmitrytrager commented Mar 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

FionaLMcLaren commented Feb 4, 2026 •

edited

Loading

devjona commented Feb 4, 2026 •

edited

Loading